* lisp/help-fns.el (describe-function-1): Check file-name is a string before

calling help-fns--autoloaded-p.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ac43b146d55d39783128e14f95e6ae2f06cff5c..6bb8cef4628ea77d58d2077906c9dfaeddc4c7d8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * help-fns.el (describe-function-1): Check file-name is a string before
+       calling help-fns--autoloaded-p (bug#17564).
+
 2014-06-24  Juri Linkov  <juri@jurta.org>
 
        * desktop.el (desktop-auto-save-enable)

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 5b0739ed9aeb80766fd7f0cbe2627f6be883286d..46b7370183554ac788cee4df6315598d38258573 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -460,7 +460,7 @@ FILE is the file where FUNCTION was probably defined."
         (beg (if (and (or (byte-code-function-p def)
                           (keymapp def)
                           (memq (car-safe def) '(macro lambda closure)))
-                      file-name
+                      (stringp file-name)
                       (help-fns--autoloaded-p function file-name))
                  (if (commandp def)
                      "an interactive autoloaded "